Cleanup - shuffled some functions to more appropriate locations`
Added empty placeholder