Simplified, should be done by tonight :D