Added all entry functionality, big update!