New laptop finally arrived yesterday, not much work being done now ;)