Major fixes to struct

Still need to work on search procedure